Bug #330022 Wrong pixel values are computed when color = 0xFF and alpha =

	* gdk/gdkcairo.c (gdk_cairo_set_source_pixbuf): Bug #330022
	Wrong pixel values are computed when color = 0xFF and alpha = 0xFF

diff --git a/ChangeLog b/ChangeLog
index 24f15380507dc09b65f1d22ba1ef41b5191fccd6..6ed331da48b77a17adb454f25f962dded4d406b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-05  Dom Lachowicz <cinamod@hotmail.com>
+
+       * gdk/gdkcairo.c (gdk_cairo_set_source_pixbuf): Bug #330022
+       Wrong pixel values are computed when color = 0xFF and alpha = 0xFF
+       
 2006-02-04  Michael Emmel  <mike.emmel@gmail.com>
        Added new directfb backend located in gdk/directfb
        plus patches to compile new backend

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 24f15380507dc09b65f1d22ba1ef41b5191fccd6..6ed331da48b77a17adb454f25f962dded4d406b2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-02-05  Dom Lachowicz <cinamod@hotmail.com>
+
+       * gdk/gdkcairo.c (gdk_cairo_set_source_pixbuf): Bug #330022
+       Wrong pixel values are computed when color = 0xFF and alpha = 0xFF
+       
 2006-02-04  Michael Emmel  <mike.emmel@gmail.com>
        Added new directfb backend located in gdk/directfb
        plus patches to compile new backend

diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c
index b20381e265d1ec771eb79c63b6b323ebf9d42207..b481648a2a1ed901ff588845ab9fd2e02481370a 100644 (file)
--- a/gdk/gdkcairo.c
+++ b/gdk/gdkcairo.c
@@ -193,7 +193,7 @@ gdk_cairo_set_source_pixbuf (cairo_t   *cr,
          guchar *end = p + 4 * width;
          guint t1,t2,t3;
            
-#define MULT(d,c,a,t) G_STMT_START { t = c * a; d = ((t >> 8) + t) >> 8; } G_STMT_END
+#define MULT(d,c,a,t) G_STMT_START { t = c * a + 0x7f; d = ((t >> 8) + t) >> 8; } G_STMT_END
 
          while (p < end)
            {